WIP Improving styling and added categories