Misc modifications in theme and positioning