Fixed UI and minor placeholder revision