fixing minor stuff in layout and still struggling with main list