tweaking layout
did some merging