Removed some unused code, CSS adjustments