Fixed user interface. Remvoe buttons still need work