Clean up + UI fixes