layout/style changes and improved sass format