Fixing it up, adding css