fixed some todos and changed some layout