Rearranged domain. Refactored a little. Cleaned up the UI