WIP - Clean up css