Sharing (Partial) UI logic complete
Code refractored