Ported to storyboard

#15 
#17 
#18