fixing layouts

- moving strings
- fixing layout issues
- restoring build routine