Implemented QA feedback on flat design.