started a rewrite using custom widgets

reached "align"
align almost redone
Merge remote-tracking branch 'origin/master'