fixed a few layout and design issues