C3 farghal #349 ux

Issue #349 
@sak93 @revcoder93 @Almgohar