added loader and some more styling