Some minor layout changes and then go to work :)