some minor changes regarding layout