Layout/color adjustments

Don't mind these, work in progress.