basic changes. fixed a layout problem