Cleaned imports
Added basic marcup and templates for users workaround