Re-organized and optimised elements styles