Fixed minor UI bugs and added couple of minor improvements