Restructure code & Beautify UI