Fix css issue
Cleanup code left over from branch
Cleanup code left over from branch