master
Optimise codebase for better maintainability and readability
Refactor layout components and remove unnecessary scss styles