more styling
merged crap