#7

Moving widgets into UI package to match activity and fragment