ui fixes and removed following button from following screen