Fixed some small bugs and layout issues