layout overhall

attempting to fix the issues