layout and various other changes

Work in progress