Big layout fixes, trying to catch up haha