Just some random styling and fixing