Functionality done, some styling needed