Added some features, tried out some new CSS. Not in fully working state.