UI and code change

Signed-off-by: perakerosenlund <Enigma1676@gmail.com>