Fixing more styling issues