Added rest of styling, optymized