Minor frontend fixes and cleaning up