Cleaning up some flaws and stabilizing some CSS