Added flat design capability