Fixed UI
Added easy integration for Intellij / Android Studio