Refactor started, more styling added, references only show on reload