05-23-b

Layout fixed

Todo:
1. New Query button & visuals
2. Validate clustering values