Fix multiple small bugs, optimise CSS