Small fixes and better layouts