Removed more unnecessities and renamed css