Various layout & color fixes