Some bugfix + layout adjustment