Small layout changes and code cleanups
Further manual improvements