adjust styles a bit, and adjust layout