New UI elements folder & cleaned code