new layout kinda fixed bro