Refactored UI, using separators, eliminated separate frames.