More styling
Weak attempt at testing