Cleaned up compose screen a bit