Updating Layout to be more compact
Implementing custom command line search