Graphical changes, resizing need to be fixed, but last commit before sleeping