Nice looking

Updted imports and other stuff so it looks cleaner