Cleanup and added css.