mostly done other than UI issue on smaller screen sizes