Added compile options and UI upgrade