Design improvement

Added spaces and a search button
Fix formating related errors
Reordered tests