Some minor styling changes and a lot of changes to the system