more layout and some main.py changes