cleaned up code, layout changes