final commit for the day, altered some styling but nothing important, and need to fix devise