some smaller changes in layout