fixed more stylings and unified classes