Widget code cleanup

[OmriLevy888]

This issue mainly refers to cleaning up some of the code by:

• Extracting smaller widgets out of existing ones
• Making use of Theme.of(context)