Redoing features, some css changes