Stage 2

a bit more styling added