Change to flat design and fix alert block issue