Flat design improvements