Refactored project a little and continued work on the html-grid