Added AWT buttons and fields
minor cleaning and fixes