Refactored styles to have smaller margins