Few ui and compile fixes