Completed base, need refactor css