Minor changes:
- Reordered drawing process
- Tested style classes