Feature/make selection screen work