Added flat and non invasive style and few tweaks