Minor fixes due to layout