Added placeholders, and editted views