Fixes #27 and add basic salamanca screen
Finish salamanca