Remove account views and make a proper index